From b62e3113e663fe170c85b228f5ec298f2a87f977 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 15 Feb 2009 22:51:56 +0000 Subject: [PATCH] Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c 2009-02-16 Tor Lillqvist Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Cast gpointer to char * before pointer arithmetic to avoid compilation error with MSVC. (_gdk_selection_property_delete): Remove unused variable. svn path=/trunk/; revision=22337 --- ChangeLog | 10 ++++++++++ gdk/win32/gdkselection-win32.c | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51b4fe4c2f..1b66aeba3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-02-16 Tor Lillqvist + + Bug 571873 - Compile error with gdk/win32/gdkselection-win32.c + + * gdk/win32/gdkselection-win32.c (gdk_selection_convert): Cast + gpointer to char * before pointer arithmetic to avoid compilation + error with MSVC. + + (_gdk_selection_property_delete): Remove unused variable. + 2009-02-13 Matthias Clasen * gdk/x11/gdkdisplay-x11.c (gdk_display_open): Don't forget to diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c index 73588b8d90..bf87ad7040 100644 --- a/gdk/win32/gdkselection-win32.c +++ b/gdk/win32/gdkselection-win32.c @@ -686,7 +686,7 @@ gdk_selection_convert (GdkWindow *requestor, if (make_dibv5) { - BITMAPV5HEADER *bV5 = data + sizeof (BITMAPFILEHEADER); + BITMAPV5HEADER *bV5 = (BITMAPV5HEADER *) ((char *) data + sizeof (BITMAPFILEHEADER)); guchar *p; int i; @@ -741,7 +741,7 @@ gdk_selection_convert (GdkWindow *requestor, bi->biSize + bi->biClrUsed * sizeof (RGBQUAD)); - memcpy (data + sizeof (BITMAPFILEHEADER), + memcpy ((char *) data + sizeof (BITMAPFILEHEADER), bi, data_length); } @@ -877,8 +877,6 @@ gdk_selection_property_get (GdkWindow *requestor, void _gdk_selection_property_delete (GdkWindow *window) { - GdkSelProp *prop; - GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p (no-op)\n", GDK_WINDOW_HWND (window))); -- 2.30.2